chore: sync upstream main - #15
Merged
Merged
Conversation
…tgg#11017) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…ngdotgg#11021) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ode (pingdotgg#11026) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ks (pingdotgg#11044) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…gg#11169) Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
…dotgg#11187) Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
…gdotgg#11304) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
…ingdotgg#11290) Co-authored-by: Claude Code <noreply@anthropic.com>
Resolve the nine conflicts the automatic sync could not, so the 51 upstream
commits blocked since 2026-09-10 can land and a fork release can carry them.
Eight were adjacent additions where both sides grew the same region: keep the
fork-only process telemetry, ticket providers and `owner: { threadId }`
alongside upstream's `T3CodeToolAvailability`, agent device environment,
`DeviceIntegrationSettings` and the `projectSettingsOverrides` rename.
The ninth was not mechanical. Upstream (pingdotgg#10639, pingdotgg#10636) cut
`ProjectSettingsPanel` from 1483 lines to 541 by extracting per-project
settings into a generic scoped-settings system, while the fork had grown
ticket UI inside the old structure. Of the 953 lines on the fork side, 870
were old upstream code the fork inherited and upstream has now relocated.
Those are deleted rather than merged forward, and the 83 ticket-specific
lines are re-anchored on upstream's own helpers: `ticketTitlePolicy` is
group-shared so it now rides `updateAllMembers` like `title` and
`projectIcon`, and per-checkout bindings write through a single
`updateProject`. Both hand-rolled mutation queues, their ref snapshots and
their rollback loops are gone.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The automatic sync has been blocked since 2026-09-10.
Sync upstream forkwent red withUpstream commits have been waiting 27h to integrate, and 51 upstream commits have been sitting outside every fork release. This resolves the nine conflicts that #14 could not merge automatically, so those commits land and a fork release carries them. Supersedes #14.Eight conflicts were adjacent additions where both sides grew the same region. The fork-only process telemetry, ticket providers and
owner: { threadId }stay, alongside upstream'sT3CodeToolAvailability, agent device environment,DeviceIntegrationSettingsand theprojectSettingsOverridesrename.The ninth was not mechanical. Upstream pingdotgg#10639 and pingdotgg#10636 cut
ProjectSettingsPanelfrom 1483 lines to 541 by extracting per-project settings into a generic scoped-settings system, while this fork had grown ticket UI inside the old structure. Of the 953 lines on the fork side of that conflict, 870 were old upstream code the fork had inherited and upstream has now relocated. Those are deleted rather than merged forward. The 83 ticket-specific lines are re-anchored on upstream's own helpers.ticketTitlePolicyis a group-shared project field, so it now ridesupdateAllMembersexactly liketitleandprojectIcon. Per-checkout provider bindings write through a singleupdateProject. Both hand-rolled mutation queues, their ref snapshots and their rollback loops are gone, which is about 60 fewer lines of parallel machinery to maintain and one less recurring conflict per sync.Behavior
No change. Ticket title policy still edits at the group level and fans out to every checkout. Provider account bindings stay per checkout, with an explicit checkout picker when a project has more than one.
Verification
568 tests green across the files that pin the ticket contract and the adapters touched:
contracts/settings,shared/serverSettings,shared/ticketTitles,TicketProviderRegistry,ProviderCommandReactor,ProjectionRepositories,ProjectionSnapshotQuery,CodexAdapter,ClaudeAdapter,CursorAdapter,GrokAdapter,CodexSessionRuntime.Typecheck exits 0 with zero errors on
@t3tools/web,@t3tools/contracts,@t3tools/sharedandt3.vp fmt --checkis clean. The two remaining lint warnings are pre-existing upstream code, verified by linting the pristineup/mainfiles:serverSettings.ts:243fires identically upstream, and thememo-dependencieswarning is upstream'ssetProjectIcondeps array, at line 290 upstream and 310 here.Two defects were found and fixed during verification rather than by inspection. A naive both-sides resolution in
contracts/settings.tsleft a.pipe(unclosed, andProviderCommandReactor.tsended up with a duplicateDeferredimport. Counting conflict markers passed both. Only running the tests caught them.Model and harness: Claude Opus 5 via Claude Code, in T3 Code.